viewport: Don't destroy pixelcache while it's still used
authorBenjamin Otte <otte@redhat.com>
Wed, 20 Jan 2016 04:09:25 +0000 (05:09 +0100)
committerBenjamin Otte <otte@redhat.com>
Wed, 20 Jan 2016 04:10:16 +0000 (05:10 +0100)
Removing the child unsets the pxielcache's style context...

gtk/gtkviewport.c

index 3edf5ec47dc7776aca972c0d5a3fb90064bd23fb..368374c5e3d4d11cd5e1ac450793f6c80c732198 100644 (file)
@@ -574,13 +574,11 @@ gtk_viewport_destroy (GtkWidget *widget)
   viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL);
   viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_VERTICAL);
 
-  if (priv->pixel_cache)
-    _gtk_pixel_cache_free (priv->pixel_cache);
-  priv->pixel_cache = NULL;
-
   g_clear_object (&priv->gadget);
 
   GTK_WIDGET_CLASS (gtk_viewport_parent_class)->destroy (widget);
+
+  g_clear_pointer (&priv->pixel_cache, _gtk_pixel_cache_free);
 }
 
 /**